Auto merge of #3956 - jessicah:update-num-cpus-dep, r=alexcrichton
authorbors <bors@rust-lang.org>
Wed, 26 Apr 2017 03:32:21 +0000 (03:32 +0000)
committerbors <bors@rust-lang.org>
Wed, 26 Apr 2017 03:32:21 +0000 (03:32 +0000)
Update num_cpus to 1.4.0 (adds support for Haiku)

This will bring it inline with rustc: https://github.com/rust-lang/rust/pull/41552


Trivial merge